test demonstrating relative paths stutter in [storage.XXXX].PATH#26435
Closed
earl-warren wants to merge 2 commits into
Closed
test demonstrating relative paths stutter in [storage.XXXX].PATH#26435earl-warren wants to merge 2 commits into
earl-warren wants to merge 2 commits into
Conversation
GiteaBot
added
the
lgtm/need 2
Member
--- a/modules/setting/storage.go
+++ b/modules/setting/storage.go
@@ -174,7 +174,7 @@ func getStorage(rootCfg ConfigProvider, name, typ string, sec ConfigSection) (*S
// extra config section will be read SERVE_DIRECT, PATH, MINIO_BASE_PATH, MINIO_BUCKET to override the targetsec when possible
extraConfigSec := sec
- if extraConfigSec == nil {
+ if extraConfigSec == nil && !targetSecIsStoragename {
extraConfigSec = storageNameSec
} |
delvh
pushed a commit
that referenced
this pull request
Aug 13, 2023
This PR rewrites the function `getStorage` and make it more clear. Include tests from #26435, thanks @earl-warren --------- Co-authored-by: Earl Warren <contact@earl-warren.org>
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Aug 13, 2023
This PR rewrites the function `getStorage` and make it more clear. Include tests from go-gitea#26435, thanks @earl-warren --------- Co-authored-by: Earl Warren <contact@earl-warren.org>
techknowlogick
pushed a commit
that referenced
this pull request
Aug 14, 2023
Backport #26441 by @lunny This PR rewrites the function `getStorage` and make it more clear. Include tests from #26435, thanks @earl-warren Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Earl Warren <contact@earl-warren.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The following:
repeats the relative path